Underscore-prefix gtk_tree_data_list_compare_func.

2004-08-11  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktreedatalist.[hc]:
	* gtk/gtkliststore.c:
	* gtk/gtktreestore.c: Underscore-prefix gtk_tree_data_list_compare_func.

	* gtk/gtk.symbols: Remove gtk_tree_data_list_compare_func.

	* gtk/makegtkalias.pl: No need to include gtktreedatalist.h any more.

diff --git a/ChangeLog b/ChangeLog
index 3006476a1f9b3cfb12b1bcd53616b10bd2d9074d..53e5fc3e25747076f60e942e4d2e32c640e08f15 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-08-11  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktreedatalist.[hc]: 
+       * gtk/gtkliststore.c:
+       * gtk/gtktreestore.c: Underscore-prefix gtk_tree_data_list_compare_func. 
+
+       * gtk/gtk.symbols: Remove gtk_tree_data_list_compare_func.
+
+       * gtk/makegtkalias.pl: No need to include gtktreedatalist.h any more.
+
 2004-08-10  Matthias Clasen  <mclasen@redhat.com>
 
        * gdk/Makefile.am: 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3006476a1f9b3cfb12b1bcd53616b10bd2d9074d..53e5fc3e25747076f60e942e4d2e32c640e08f15 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,13 @@
+2004-08-11  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktreedatalist.[hc]: 
+       * gtk/gtkliststore.c:
+       * gtk/gtktreestore.c: Underscore-prefix gtk_tree_data_list_compare_func. 
+
+       * gtk/gtk.symbols: Remove gtk_tree_data_list_compare_func.
+
+       * gtk/makegtkalias.pl: No need to include gtktreedatalist.h any more.
+
 2004-08-10  Matthias Clasen  <mclasen@redhat.com>
 
        * gdk/Makefile.am: 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3006476a1f9b3cfb12b1bcd53616b10bd2d9074d..53e5fc3e25747076f60e942e4d2e32c640e08f15 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,13 @@
+2004-08-11  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktreedatalist.[hc]: 
+       * gtk/gtkliststore.c:
+       * gtk/gtktreestore.c: Underscore-prefix gtk_tree_data_list_compare_func. 
+
+       * gtk/gtk.symbols: Remove gtk_tree_data_list_compare_func.
+
+       * gtk/makegtkalias.pl: No need to include gtktreedatalist.h any more.
+
 2004-08-10  Matthias Clasen  <mclasen@redhat.com>
 
        * gdk/Makefile.am: 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3006476a1f9b3cfb12b1bcd53616b10bd2d9074d..53e5fc3e25747076f60e942e4d2e32c640e08f15 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,13 @@
+2004-08-11  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktreedatalist.[hc]: 
+       * gtk/gtkliststore.c:
+       * gtk/gtktreestore.c: Underscore-prefix gtk_tree_data_list_compare_func. 
+
+       * gtk/gtk.symbols: Remove gtk_tree_data_list_compare_func.
+
+       * gtk/makegtkalias.pl: No need to include gtktreedatalist.h any more.
+
 2004-08-10  Matthias Clasen  <mclasen@redhat.com>
 
        * gdk/Makefile.am: 

diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index bae83ae70b76f6c0a696ad778cd3a2c00466ed94..730ae235954c72be15cc51cae8d2c23d099d3147 100644 (file)
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -2268,7 +2268,6 @@ gtk_tooltips_set_tip
 gtk_tree_append
 gtk_tree_child_position
 gtk_tree_clear_items
-gtk_tree_data_list_compare_func
 gtk_tree_drag_dest_drag_data_received
 gtk_tree_drag_dest_get_type
 gtk_tree_drag_dest_row_drop_possible

diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index e20ce14bb33bf4db463b7daed10e2f262a4c60d2..74dcb8cfa4a04d2e35858a5563480814397c8df8 100644 (file)
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@@ -845,7 +845,7 @@ gtk_list_store_set_valist (GtkListStore *list_store,
        }
     }
 
-  if (func != gtk_tree_data_list_compare_func)
+  if (func != _gtk_tree_data_list_compare_func)
     maybe_need_sort = TRUE;
 
   while (column != -1)
@@ -879,7 +879,7 @@ gtk_list_store_set_valist (GtkListStore *list_store,
                                                   &value,
                                                   FALSE) || emit_signal;
 
-      if (func == gtk_tree_data_list_compare_func &&
+      if (func == _gtk_tree_data_list_compare_func &&
          column == list_store->sort_column_id)
        maybe_need_sort = TRUE;
 
@@ -2183,7 +2183,7 @@ gtk_list_store_sort_iter_changed (GtkListStore *list_store,
     }
 
   /* If it's the built in function, we don't sort. */
-  if (func == gtk_tree_data_list_compare_func &&
+  if (func == _gtk_tree_data_list_compare_func &&
       list_store->sort_column_id != column)
     return;
 

diff --git a/gtk/gtktreedatalist.c b/gtk/gtktreedatalist.c
index 6c1714ebfe2b4634a527c1c44b81d36cef0fdd61..1d17d91616385fb339af0532fe039cd729a23d65 100644 (file)
--- a/gtk/gtktreedatalist.c
+++ b/gtk/gtktreedatalist.c
@@ -298,10 +298,10 @@ _gtk_tree_data_list_node_copy (GtkTreeDataList *list,
 }
 
 gint
-gtk_tree_data_list_compare_func (GtkTreeModel *model,
-                                GtkTreeIter  *a,
-                                GtkTreeIter  *b,
-                                gpointer      user_data)
+_gtk_tree_data_list_compare_func (GtkTreeModel *model,
+                                 GtkTreeIter  *a,
+                                 GtkTreeIter  *b,
+                                 gpointer      user_data)
 {
   gint column = GPOINTER_TO_INT (user_data);
   GType type = gtk_tree_model_get_column_type (model, column);
@@ -460,7 +460,7 @@ _gtk_tree_data_list_header_new (gint   n_columns,
 
       retval = g_list_prepend (retval, header);
       header->sort_column_id = i;
-      header->func = gtk_tree_data_list_compare_func;
+      header->func = _gtk_tree_data_list_compare_func;
       header->destroy = NULL;
       header->data = GINT_TO_POINTER (i);
     }

diff --git a/gtk/gtktreedatalist.h b/gtk/gtktreedatalist.h
index d5708f06d24c6ba8dee9f7bca3f4cd1f9a5fd951..247a33a355cd581967af28247b64d326a5a3f144 100644 (file)
--- a/gtk/gtktreedatalist.h
+++ b/gtk/gtktreedatalist.h
@@ -67,10 +67,10 @@ GtkTreeDataList *_gtk_tree_data_list_node_copy      (GtkTreeDataList *list,
                                                      GType            type);
 
 /* Header code */
-gint                   gtk_tree_data_list_compare_func (GtkTreeModel *model,
-                                                       GtkTreeIter  *a,
-                                                       GtkTreeIter  *b,
-                                                       gpointer      user_data);
+gint                   _gtk_tree_data_list_compare_func (GtkTreeModel *model,
+                                                        GtkTreeIter  *a,
+                                                        GtkTreeIter  *b,
+                                                        gpointer      user_data);
 GList *                _gtk_tree_data_list_header_new  (gint          n_columns,
                                                        GType        *types);
 void                   _gtk_tree_data_list_header_free (GList        *header_list);

diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c
index ef6549ab1382f89a5df78200ac7c2b9fa46ca974..e590955a31922812ba20b8e7a2e266e813dead4a 100644 (file)
--- a/gtk/gtktreestore.c
+++ b/gtk/gtktreestore.c
@@ -966,7 +966,7 @@ gtk_tree_store_set_valist (GtkTreeStore *tree_store,
        }
     }
 
-  if (func != gtk_tree_data_list_compare_func)
+  if (func != _gtk_tree_data_list_compare_func)
     maybe_need_sort = TRUE;
 
   while (column != -1)
@@ -999,7 +999,7 @@ gtk_tree_store_set_valist (GtkTreeStore *tree_store,
                                                   &value,
                                                   FALSE) || emit_signal;
 
-      if (func == gtk_tree_data_list_compare_func &&
+      if (func == _gtk_tree_data_list_compare_func &&
          column == tree_store->sort_column_id)
        maybe_need_sort = TRUE;
 
@@ -2673,7 +2673,7 @@ gtk_tree_store_sort_iter_changed (GtkTreeStore *tree_store,
     }
 
   /* If it's the built in function, we don't sort. */
-  if (func == gtk_tree_data_list_compare_func &&
+  if (func == _gtk_tree_data_list_compare_func &&
       tree_store->sort_column_id != column)
     return;
 

diff --git a/gtk/makegtkalias.pl b/gtk/makegtkalias.pl
index c47eeb1170e6fd5f2dbef7dd89dc1309b69834d7..170832fc406c749a9e752e0e5d422b31c1c1d9d8 100755 (executable)
--- a/gtk/makegtkalias.pl
+++ b/gtk/makegtkalias.pl
@@ -38,7 +38,6 @@ print <<EOF;
 #include "gtktextlayout.h"
 #include "gtktextsegment.h"
 #include "gtktexttypes.h"
-#include "gtktreedatalist.h"
 #include "gtkthemes.h"
 #include "gtkwindow-decorate.h"